//
//  ViewController.m
//  danche
//
//  Created by xue-iOS-work on 16/12/23.
//  Copyright © 2016年 cn. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
<<<<<<< HEAD
    NSLog(@"XXX");
    
    
=======
        NSLog(@"SDASDA");
>>>>>>> 977507d50bd924f8eabed7e018f1e9a9de15e5d2
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}


@end
